Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 31 Mar 2010 21:55:47 +0000 (21:55 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 31 Mar 2010 21:55:47 +0000 (21:55 +0000)

Trivial merge